Add MANDIR, MAN1DIR and MAN8DIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index e0a29f7d0c0374c1d34ff09842d0d5f69875c92a..e1a8b6f6be5878c72ddd572fe8098fdd38980eb9 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -22,6 +22,9 @@ BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib64
+MANDIR = $(PREFIX)/share/man
+MAN1DIR = $(MANDIR)/man1
+MAN8DIR = $(MANDIR)/man8
 SBINDIR = $(PREFIX)/sbin
 
 SOCKET_LIBS =

diff --git a/config/SunOS.mk b/config/SunOS.mk
index ffa0a778f7977f1e2683bcbbaa85fe44defce456..3992689f837c2016b6f75bd75b3d3e3c90c050f6 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -23,6 +23,9 @@ BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib/amd64
+MANDIR = $(PREFIX)/share/man
+MAN1DIR = $(MANDIR)/man1
+MAN8DIR = $(MANDIR)/man8
 SBINDIR = $(PREFIX)/sbin
 
 SunOS_LIBDIR = /usr/sfw/lib

diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile
index 94c61fde99464d5c14f1e9ede60952f07f5ae6ea..43049de85fc83a2965a2bfd6ab9b9a55ec38cb01 100644 (file)
--- a/tools/debugger/xenitp/Makefile
+++ b/tools/debugger/xenitp/Makefile
@@ -28,14 +28,12 @@ build: $(BIN) $(LIBBIN)
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
-       [ -d $(DESTDIR)/usr/share/man/man1 ] || \
-               $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
-       [ -d $(DESTDIR)/usr/share/man/man8 ] || \
-               $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
+       $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
        $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
-       $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
-       $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
+       $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+       $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
 
 .PHONY: clean
 clean:

diff --git a/tools/vnet/doc/Makefile b/tools/vnet/doc/Makefile
index 38accfa7f64a40e6163b9caaeb402dd98f2fc9a2..a234721b5111da6202b21d225fee2b2416612415 100644 (file)
--- a/tools/vnet/doc/Makefile
+++ b/tools/vnet/doc/Makefile
@@ -13,8 +13,6 @@ LATEX2HTML    := latex2html
 DOXYGEN                := doxygen
 POD2MAN                := pod2man
 
-MAN_DIR                := /usr/share/man
-
 DOC_MAN5SRC    := $(wildcard man/*.pod.5)
 DOC_MAN1SRC    := $(wildcard man/*.pod.1)
 DOC_MAN1       := $(patsubst man/%.pod.1,man1/%.1,$(DOC_MAN1SRC))
@@ -47,7 +45,7 @@ clean:
 
 .PHONY:  install
  install: all
-       $(INSTALL_DIR) $(DESTDIR)$(MAN_DIR)
-       $(CP) -dR man1 $(DESTDIR)$(MAN_DIR)
-       $(CP) -dR man5 $(DESTDIR)$(MAN_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+       $(CP) -dR man1 $(DESTDIR)$(MANDIR)
+       $(CP) -dR man5 $(DESTDIR)$(MANDIR)
 

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 479cee76e778202e0ade13e63f677aad22e5356f..4b862a4ec55e793af6b054c816c91398803744a3 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -18,10 +18,6 @@ ifneq ($(XENSTAT_XENTOP),y)
 all install xentop:
 else
 
-prefix=/usr
-mandir=$(prefix)/share/man
-man1dir=$(mandir)/man1
-
 CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
 LDFLAGS += -L$(XEN_LIBXENSTAT)
 LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
@@ -34,8 +30,8 @@ all: xentop
 install: xentop xentop.1
        $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
-       $(INSTALL_DIR) $(DESTDIR)$(man1dir)
-       $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
+       $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+       $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1
 
 endif
 

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 5e46c9031017e175e698ce71d9c2229178f03eb7..022f01e08a9c0dd38a48dc3139ef957ca831635d 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -37,14 +37,12 @@ build: $(BIN) $(LIBBIN)
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
-       [ -d $(DESTDIR)/usr/share/man/man1 ] || \
-               $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
-       [ -d $(DESTDIR)/usr/share/man/man8 ] || \
-               $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
+       $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
        $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
-       $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
-       $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
+       $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+       $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
 
 .PHONY: clean
 clean: